From 0f309c9dcf36062d82242e98c2ec09fa1dc0330e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Oct 2014 23:46:11 -0400 Subject: [PATCH] Skip GdkX11GLContext in some object tests Since it can't be constructed without specifying a GdkWindow, which we don't have here. --- testsuite/gtk/notify.c | 3 ++- testsuite/gtk/objects-finalize.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c index a5d421b8d0..1ff660c5d7 100644 --- a/testsuite/gtk/notify.c +++ b/testsuite/gtk/notify.c @@ -389,7 +389,8 @@ test_type (gconstpointer data) g_str_equal (g_type_name (type), "GdkX11DeviceManagerXI2") || g_str_equal (g_type_name (type), "GdkX11Display") || g_str_equal (g_type_name (type), "GdkX11DisplayManager") || - g_str_equal (g_type_name (type), "GdkX11Screen")) + g_str_equal (g_type_name (type), "GdkX11Screen") || + g_str_equal (g_type_name (type), "GdkX11GLContext")) return; /* This throws a critical when the connection is dropped */ diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c index fd28f88c6b..35685059f1 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/testsuite/gtk/objects-finalize.c @@ -114,6 +114,7 @@ main (int argc, char **argv) all_types[i] != GDK_TYPE_X11_DISPLAY && all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && + all_types[i] != GDK_TYPE_X11_GL_CONTEXT && #endif /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ all_types[i] != GDK_TYPE_PIXBUF_LOADER && -- 2.30.2